Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 10 Dec 2010 18:27:54 +0000 (18:27 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 10 Dec 2010 18:27:54 +0000 (18:27 +0000)

Trivial merge